From: Colin Walters <walters@verbum.org>
Date: Tue, 24 Jun 2025 15:14:41 +0000 (-0400)
Subject: prepare-root: Don't hardcode sysroot
X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2~4^2~18^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=56ddd3a48ea63a79e1372dacac53fee8aada1bf0;p=ostree.git

prepare-root: Don't hardcode sysroot

Follow to previous change to factor out composefs mounting;
prep for soft reboots.

Signed-off-by: Colin Walters <walters@verbum.org>
---

diff --git a/src/libotcore/otcore-prepare-root.c b/src/libotcore/otcore-prepare-root.c
index 01acf5cf..fa990dec 100644
--- a/src/libotcore/otcore-prepare-root.c
+++ b/src/libotcore/otcore-prepare-root.c
@@ -375,7 +375,8 @@ otcore_mount_composefs (ComposefsConfig *composefs_config, GVariantBuilder *meta
   if (composefs_config->enabled == OT_TRISTATE_NO)
     return TRUE;
 
-  const char *objdirs[] = { "/sysroot/ostree/repo/objects" };
+  g_autofree char *sysroot_objects = g_strdup_printf ("%s/ostree/repo/objects", root_mountpoint);
+  const char *objdirs[] = { sysroot_objects };
   struct lcfs_mount_options_s cfs_options = {
     objdirs,
     1,